Undeprecate gtk_binding_entry_add_signall

svn path=/trunk/; revision=22314

diff --git a/ChangeLog b/ChangeLog
index ca5d28c7ac6905ab22329d6af43419b1a6886ad8..6e97543e9a6d580818b32da842ac1323d619c151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 571196 – gtk_binding_entry_add_signall deprecated without 
+       alternative
+       * gtk/gtk.symbols:
+       * gtk/gtkbindings.[hc]: Undeprecate gtk_binding_entry_add_signall
+       since its replacement is a varargs function. Complaint by
+       Torsten Schoenfeld.
+
 2009-02-11  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 571249 – Icons are not drawn properly when initial widget 

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index a2195c0b03fe652615af77996b8568e598bb4898..53bcc5e23de3acf8aca3c27e0b878b7e83fc250f 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -443,11 +443,11 @@ gtk_aspect_frame_set
 #if IN_FILE(__GTK_BINDINGS_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_binding_entry_clear
-gtk_binding_entry_add_signall
 gtk_binding_parse_binding
 #endif
 gtk_binding_entry_skip
 gtk_binding_entry_add_signal
+gtk_binding_entry_add_signall
 gtk_binding_entry_remove
 gtk_bindings_activate
 gtk_bindings_activate_event

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index f2e09cf626fb8bc38136aa60bdb852c48a9ac800..0d2e832537101d6451099e05a4bc98545d3dc171 100644 (file)
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -805,8 +805,6 @@ gtk_binding_entry_remove (GtkBindingSet      *binding_set,
  *
  * Override or install a new key binding for @keyval with @modifiers on
  * @binding_set.
- *
- * Deprecated: 2.12: Use gtk_binding_entry_add_signal() instead.
  */
 void
 gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,

diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 5e34feb321c64453b60f77a56d0532eea61440ce..0ff74230c4d5d583d2ac671921fb03357a56b4c5 100644 (file)
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -116,11 +116,6 @@ gboolean gtk_binding_set_activate  (GtkBindingSet  *binding_set,
 void    gtk_binding_entry_clear        (GtkBindingSet  *binding_set,
                                         guint           keyval,
                                         GdkModifierType modifiers);
-void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers,
-                                        const gchar    *signal_name,
-                                        GSList         *binding_args);
 guint   gtk_binding_parse_binding      (GScanner       *scanner);
 #endif /* GTK_DISABLE_DEPRECATED */
 
@@ -133,6 +128,11 @@ void        gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
                                          const gchar    *signal_name,
                                          guint           n_args,
                                          ...);
+void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
+                                        guint           keyval,
+                                        GdkModifierType modifiers,
+                                        const gchar    *signal_name,
+                                        GSList         *binding_args);
 void    gtk_binding_entry_remove       (GtkBindingSet  *binding_set,
                                         guint           keyval,
                                         GdkModifierType modifiers);